Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Nov 2011 01:37:41 +0000 (17:37 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Thu, 17 Nov 2011 01:37:41 +0000 (17:37 -0800)

Trivial merge